X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/2201d8663f609578daa21e0f6f27cd862a2cb577..e2ba0554f2a930302841b39c6b3b53d69aacf5aa:/cdmlib-remote-webapp/ide/eclipse/Jetty%20Launcher/cdmlib-remote-webapp%20-%20run.launch

diff --git a/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp - run.launch b/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp - run.launch
old mode 100644
new mode 100755
index adc883bf14..1faf8cd19b
--- a/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp - run.launch	
+++ b/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp - run.launch	
@@ -56,9 +56,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="net.sourceforge.eclipsejetty.launcher.JettyLaunchClassPathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.sourceforge.eclipsejetty.starter.jetty9.Jetty9LauncherMain"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdmlib-remote-webapp"/>
-<<<<<<< Updated upstream
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx2000M&#13;&#10;-XX:PermSize=150m&#13;&#10;&#13;&#10;-Dlog4j.configDebug=false&#13;&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties&#13;&#10;&#13;&#10;-Dcdm.forceSchemaUpdate=true&#13;&#10;-Dspring.profiles.active=remoting"/>
-=======
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1000M&#13;&#10;-XX:PermSize=150m&#13;&#10;&#13;&#10;-Dlog4j.configDebug=false&#13;&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties&#13;&#10;&#13;&#10;-Dcdm.forceSchemaUpdate=true&#13;&#10;-Dspring.profiles.active=remoting"/>
->>>>>>> Stashed changes
 </launchConfiguration>